bitkeeper revision 1.1159.70.3 (41389f22BlnxYbup7d6jcZXvICR6qg)

Fix problem with domain shutdown events.

diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py
index 2111a166bd82076347776ead88e5b6b24bcb2716..afe2a4601bfb23ae96314f7d63be54def56c3dd8 100644 (file)
--- a/tools/python/xen/xend/XendDomain.py
+++ b/tools/python/xen/xend/XendDomain.py
@@ -243,12 +243,12 @@ class XendDomain:
             if d['shutdown']:
                 reason = XendDomainInfo.shutdown_reason(d['shutdown_reason'])
                 log.debug('XendDomain>reap> shutdown id=%s reason=%s', id, reason)
+                dominfo = self.domain_by_id.get(id)
+                name = (dominfo and dominfo.name) or '??'
                 if reason in ['suspend']:
-                    dominfo = self.domain_by_id.get(id)
                     if dominfo.is_terminated():
                         log.debug('XendDomain>reap> Suspended domain died id=%s', id)
                     else:
-                        name = (dominfo and dominfo.name) or '??'
                         eserver.inject('xend.domain.suspended', [name, id])
                         continue
                 if reason in ['poweroff', 'reboot']: